From 33324922814a3e550d3210b11726bc719043501d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 12 Jul 2014 04:46:20 +0200
Subject: [PATCH] socket: Don't include gtk.h

And fix remaining headers to not emit warnings
---
 gtk/gtkplug.c   | 1 +
 gtk/gtkplug.h   | 2 +-
 gtk/gtksocket.h | 4 ++--
 gtk/gtkx.h      | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index c45b31b2aa..7f68e0a2fe 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -34,6 +34,7 @@
 #include "gtkprivate.h"
 #include "gtksocketprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"
 #include "gtkxembed.h"
 
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 43c00eaa35..1a2c1651ef 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -36,7 +36,7 @@
 #include <gdk/gdkx.h>
 
 #include <gtk/gtksocket.h>
-
+#include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index abd9bade74..ec22ba1337 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -29,12 +29,12 @@
 #error "Only <gtk/gtkx.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
-
 #ifdef GDK_WINDOWING_X11
 
 #include <gdk/gdkx.h>
 
+#include <gtk/gtkcontainer.h>
+
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SOCKET            (gtk_socket_get_type ())
diff --git a/gtk/gtkx.h b/gtk/gtkx.h
index 4033d5d28e..10f3dfaedc 100644
--- a/gtk/gtkx.h
+++ b/gtk/gtkx.h
@@ -20,6 +20,8 @@
 
 #define __GTKX_H_INSIDE__
 
+#include <gtk/gtk.h>
+
 #include <gtk/gtksocket.h>
 #include <gtk/gtkplug.h>
 
-- 
2.30.2